Merge remote branch 'origin/upstream-cvs'
authorBernd Zeimetz <bernd@bzed.de>
Tue, 4 May 2010 20:22:20 +0000 (22:22 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 4 May 2010 20:22:20 +0000 (22:22 +0200)

Trivial merge